auto merge of #1089 : bheart/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 25 Dec 2014 04:28:40 +0000 (04:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 25 Dec 2014 04:28:40 +0000 (04:28 +0000)
commitfd5d7a9ac7eebc55aeae9f7ce1c15bcbe2209b25
treea35f1c85562893e4f1780fdaeb9bbf9bc206cd01
parent764644a28f484d36d64b3a0da5f0f5429564fc02
parentae5eb85e3d5434075870e0fd6951be549657a409
auto merge of #1089 : bheart/cargo/master, r=alexcrichton

Builds break on recent versions of rustc.

This is in response to rust-lang/rust@16f01cc - the change was addressed
in rust-lang/rustc-serialize@1561cca, versioned 0.1.5.

Update dependency accordingly.